Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 05:31:09 +0000 (22:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 05:31:09 +0000 (22:31 -0700)

Trivial merge